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

[Sybren A. Stüvel]

Commit: bb31648b9b4d676b66be126f1842fa4a654f5fa1
Author: Sybren A. Stüvel
Date:   Tue Apr 18 16:47:25 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBbb31648b9b4d676b66be126f1842fa4a654f5fa1

Merge branch 'master' into blender2.8

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



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