[Bf-blender-cvs] [3eae585] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 3eae585791fb15db6cc0a081b30bb6a78b4f82bf
Author: Bastien Montagne
Date:   Sat Aug 6 12:57:21 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB3eae585791fb15db6cc0a081b30bb6a78b4f82bf

Merge branch 'master' into blender2.8

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



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