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

[Bastien Montagne]

Commit: 41c5ec21b3a8d83f7a7a6f660409bf9cec606bc3
Author: Bastien Montagne
Date:   Tue May 3 15:32:05 2016 +0200
Branches: id-remap
https://developer.blender.org/rB41c5ec21b3a8d83f7a7a6f660409bf9cec606bc3

Merge branch 'master' into id-remap

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



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