[Bf-blender-cvs] [6d33653] experimental-build: Merge branch 'master' into experimental-build

[Bastien Montagne]

Commit: 6d336537943b57575d6469d6a5c5ca55a47d0b69
Author: Bastien Montagne
Date:   Wed Aug 19 23:20:09 2015 +0200
Branches: experimental-build
https://developer.blender.org/rB6d336537943b57575d6469d6a5c5ca55a47d0b69

Merge branch 'master' into experimental-build

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



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