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

[Bastien Montagne]

Commit: a0df6ce03be1dc2bd523325df24befefb658bf94
Author: Bastien Montagne
Date:   Thu Nov 26 12:42:56 2015 +0100
Branches: id-remap
https://developer.blender.org/rBa0df6ce03be1dc2bd523325df24befefb658bf94

Merge branch 'master' into id-remap

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



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