[Bf-blender-cvs] [42ed1f0] blender2.8 custom-manipulators: Merge branch 'master' into blender2.8

[Julian Eisel]

Commit: 42ed1f0e3cbd9d477b7a535b52030c7905ca5362
Author: Julian Eisel
Date:   Fri Sep 30 01:18:41 2016 +0200
Branches: blender2.8 custom-manipulators
https://developer.blender.org/rB42ed1f0e3cbd9d477b7a535b52030c7905ca5362

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenloader/intern/writefile.c

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



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