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

[Campbell Barton]

Commit: fc1fd2704a7b1cc448b20ed5cb596784cb764224
Author: Campbell Barton
Date:   Tue Jan 23 11:45:39 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBfc1fd2704a7b1cc448b20ed5cb596784cb764224

Merge branch 'master' into blender2.8

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



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