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

[Bastien Montagne]

Commit: c089f28504d5c81aeb7f43cc4aefc12926b212cd
Author: Bastien Montagne
Date:   Wed Dec 16 21:34:04 2015 +0100
Branches: id-remap
https://developer.blender.org/rBc089f28504d5c81aeb7f43cc4aefc12926b212cd

Merge branch 'master' into id-remap

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



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