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

[Campbell Barton]

Commit: bb45381bc2e4cfe16ac2e7dd2df6fc2bec9ed614
Author: Campbell Barton
Date:   Tue May 22 08:49:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbb45381bc2e4cfe16ac2e7dd2df6fc2bec9ed614

Merge branch 'master' into blender2.8

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



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