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

[Campbell Barton]

Commit: a3c630aebb34e88de3a4820a0bb0f4359e13570d
Author: Campbell Barton
Date:   Wed Jun 13 18:25:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa3c630aebb34e88de3a4820a0bb0f4359e13570d

Merge branch 'master' into blender2.8

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



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