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

[Campbell Barton]

Commit: 7d48a342d66cc7664b008ff512bd00e740eb7629
Author: Campbell Barton
Date:   Sat Jun 30 18:06:20 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7d48a342d66cc7664b008ff512bd00e740eb7629

Merge branch 'master' into blender2.8

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



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