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

[Campbell Barton]

Commit: a6c60affffc99270e94a123092d8b9c0942cccaa
Author: Campbell Barton
Date:   Wed May 24 21:16:54 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBa6c60affffc99270e94a123092d8b9c0942cccaa

Merge branch 'master' into blender2.8

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



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