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

[Bastien Montagne]

Commit: dd2f00e8befc0a0116955a3f0eec9120c5eb5f24
Author: Bastien Montagne
Date:   Wed Jun 22 12:25:29 2016 +0200
Branches: id-remap
https://developer.blender.org/rBdd2f00e8befc0a0116955a3f0eec9120c5eb5f24

Merge branch 'master' into id-remap

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



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