[Bf-blender-cvs] [b3ed2a87512] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Nick Wu]

Commit: b3ed2a875122ca3d1224b9ed534c5e5fb2d3186a
Author: Nick Wu
Date:   Wed Sep 12 22:27:01 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBb3ed2a875122ca3d1224b9ed534c5e5fb2d3186a

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
#	source/tools

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



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