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

[Nick Wu]

Commit: 1bd6f3605d0e12f6b595ca2dadaed8c177cdf3bd
Author: Nick Wu
Date:   Sat Sep 15 11:03:29 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB1bd6f3605d0e12f6b595ca2dadaed8c177cdf3bd

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

# Conflicts:
#	release/scripts/addons_contrib
#	release/scripts/startup/bl_ui/properties_physics_cloth.py
#	source/tools

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



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