[Bf-blender-cvs] [dac64859386] soc-2019-npr: Merge remote-tracking branch 'origin/master' into soc-2019-npr

[Yiming Wu]

Commit: dac648593862f12835eb60a08d167a71c3d0cddf
Author: Yiming Wu
Date:   Wed May 29 16:23:33 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBdac648593862f12835eb60a08d167a71c3d0cddf

Merge remote-tracking branch 'origin/master' into soc-2019-npr

# Conflicts:
#	release/datafiles/locale
#	release/scripts/addons
#	release/scripts/addons_contrib

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



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