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

[Campbell Barton]

Commit: b97bf844b36f2e54d8dedb66aaf19f7ce48fefe5
Author: Campbell Barton
Date:   Tue Jul 25 20:53:10 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBb97bf844b36f2e54d8dedb66aaf19f7ce48fefe5

Merge branch 'master' into blender2.8

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



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