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

[Bastien Montagne]

Commit: 928a53671e4f32472ffaa04bb16527a64093bcdb
Author: Bastien Montagne
Date:   Wed Jun 22 18:05:05 2016 +0200
Branches: id-remap
https://developer.blender.org/rB928a53671e4f32472ffaa04bb16527a64093bcdb

Merge branch 'master' into id-remap

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



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