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

[Bastien Montagne]

Commit: beaf33dfb20b1a13e47f15bc19ef8e34718e6162
Author: Bastien Montagne
Date:   Tue Jun 14 16:36:42 2016 +0200
Branches: id-remap
https://developer.blender.org/rBbeaf33dfb20b1a13e47f15bc19ef8e34718e6162

Merge branch 'master' into id-remap

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



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