[Bf-blender-cvs] [3cce86e] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 3cce86e4d33733621c7dca68c3a9a1697eb54f35
Author: Bastien Montagne
Date:   Wed Sep 16 17:46:32 2015 +0200
Branches: id-remap
https://developer.blender.org/rB3cce86e4d33733621c7dca68c3a9a1697eb54f35

Merge branch 'master' into id-remap

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



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