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

[Bastien Montagne]

Commit: 45b83f6fd5088f05331f10c12d69e26ba93dcf9b
Author: Bastien Montagne
Date:   Mon Oct 5 16:00:33 2015 +0200
Branches: id-remap
https://developer.blender.org/rB45b83f6fd5088f05331f10c12d69e26ba93dcf9b

Merge branch 'master' into id-remap

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



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