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

[Campbell Barton]

Commit: 49ee1a97d2704d8cc707201675a919b9ef103fec
Author: Campbell Barton
Date:   Mon Apr 16 18:22:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB49ee1a97d2704d8cc707201675a919b9ef103fec

Merge branch 'master' into blender2.8

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



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