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

[Nick Wu]

Commit: 8e58b88ea432cca8548fc85b0390a2a688e4c120
Author: Nick Wu
Date:   Thu Aug 23 18:55:32 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB8e58b88ea432cca8548fc85b0390a2a688e4c120

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

# Conflicts:
#	release/scripts/addons
#	release/scripts/addons_contrib
#	source/tools

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



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