[Bf-blender-cvs] [41b118c9d96] soc-2017-normal-tools: Merge branch 'master' into soc-2017-normal-tools

[Bastien Montagne]

Commit: 41b118c9d96514399f464e21fb778200cd687541
Author: Bastien Montagne
Date:   Tue Jun 27 15:08:56 2017 +0200
Branches: soc-2017-normal-tools
https://developer.blender.org/rB41b118c9d96514399f464e21fb778200cd687541

Merge branch 'master' into soc-2017-normal-tools

Conflicts:
	source/blender/python/intern/bpy_props.c

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



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