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

[Campbell Barton]

Commit: 135b7f5c6ab5761669256d1f15e37122ec9533cb
Author: Campbell Barton
Date:   Fri Jul 13 18:04:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB135b7f5c6ab5761669256d1f15e37122ec9533cb

Merge branch 'master' into blender2.8

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



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