[Bf-blender-cvs] [09df8bd] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 09df8bd2e031cf31f1dbcd461eb5ca5b2620ed71
Author: Bastien Montagne
Date:   Mon Jun 13 12:47:09 2016 +0200
Branches: id-remap
https://developer.blender.org/rB09df8bd2e031cf31f1dbcd461eb5ca5b2620ed71

Merge branch 'master' into id-remap

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



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