[Bf-blender-cvs] [f4b4087] experimental-build: Merge remote-tracking branch 'origin/master' into experimental-build

[Lukas Stockner]

Commit: f4b4087b85acb18e808e4d439ab14e174f73e24b
Author: Lukas Stockner
Date:   Thu Oct 22 18:13:17 2015 +0200
Branches: experimental-build
https://developer.blender.org/rBf4b4087b85acb18e808e4d439ab14e174f73e24b

Merge remote-tracking branch 'origin/master' into experimental-build

===================================================================



===================================================================