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

[Bastien Montagne]

Commit: f820643e9f96e9d4d65371b502c2f2ab0672a74c
Author: Bastien Montagne
Date:   Wed Mar 30 21:36:53 2016 +0200
Branches: id-remap
https://developer.blender.org/rBf820643e9f96e9d4d65371b502c2f2ab0672a74c

Merge branch 'master' into id-remap

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



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