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

[Brecht Van Lommel]

Commit: d1b726ed3b1c696c8dd28c5e799dd79e465c70d7
Author: Brecht Van Lommel
Date:   Sat Jun 24 16:44:28 2017 +0200
Branches: experimental-build
https://developer.blender.org/rBd1b726ed3b1c696c8dd28c5e799dd79e465c70d7

Merge branch 'master' into experimental-build

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



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