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

[Nick Wu]

Commit: 843a57e3a5a01449735b8bc68743afa11522268a
Author: Nick Wu
Date:   Sun Sep 16 15:02:02 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB843a57e3a5a01449735b8bc68743afa11522268a

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

# Conflicts:
#	release/scripts/addons

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



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