[Bf-blender-cvs] [7fa92ad] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 7fa92ad950bec9df46d9acdbca20fa2aa81e7b22
Author: Bastien Montagne
Date:   Tue Nov 24 09:50:29 2015 +0100
Branches: id-remap
https://developer.blender.org/rB7fa92ad950bec9df46d9acdbca20fa2aa81e7b22

Merge branch 'master' into id-remap

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



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