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

[Campbell Barton]

Commit: f3a8f97fcfa39d5dfe3e1f9d1b534e4f42ba9689
Author: Campbell Barton
Date:   Sun Apr 15 10:52:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf3a8f97fcfa39d5dfe3e1f9d1b534e4f42ba9689

Merge branch 'master' into blender2.8

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



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