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

[Bastien Montagne]

Commit: cbe64753838a7a2f02d69519ec174af8a4605c3b
Author: Bastien Montagne
Date:   Fri May 6 13:28:20 2016 +0200
Branches: id-remap
https://developer.blender.org/rBcbe64753838a7a2f02d69519ec174af8a4605c3b

Merge branch 'master' into id-remap

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



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