[Bf-blender-cvs] [81edad9] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 81edad9966fe9390f03bda015c83d2fdbc8e29ef
Author: Bastien Montagne
Date:   Sat Nov 28 21:45:12 2015 +0100
Branches: id-remap
https://developer.blender.org/rB81edad9966fe9390f03bda015c83d2fdbc8e29ef

Merge branch 'master' into id-remap

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



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