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

[Nick Wu]

Commit: 8ae40f4fcb571818ac83325ecedfe051e82b0c15
Author: Nick Wu
Date:   Wed Sep 19 22:24:36 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB8ae40f4fcb571818ac83325ecedfe051e82b0c15

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

# Conflicts:
#	release/scripts/addons

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



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