[Bf-blender-cvs] [96c8baf] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 96c8baf7f546904bfe4840c33a40d3df8822cece
Author: Bastien Montagne
Date:   Wed Jun 22 18:12:28 2016 +0200
Branches: id-remap
https://developer.blender.org/rB96c8baf7f546904bfe4840c33a40d3df8822cece

Merge branch 'master' into id-remap

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



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