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

[Sergey Sharybin]

Commit: 114013de0d3fbb6b6336eec50ce99fbd49f401f7
Author: Sergey Sharybin
Date:   Fri Dec 15 17:24:28 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB114013de0d3fbb6b6336eec50ce99fbd49f401f7

Merge branch 'master' into blender2.8

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



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