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

[Bastien Montagne]

Commit: e099dbca33d609d68939fc9c186508540213138d
Author: Bastien Montagne
Date:   Wed Jun 22 17:54:29 2016 +0200
Branches: id-remap
https://developer.blender.org/rBe099dbca33d609d68939fc9c186508540213138d

Merge branch 'master' into id-remap

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



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