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

[Bastien Montagne]

Commit: dcd87141c677cd555bf9156bc8559ec6dbfe5c5d
Author: Bastien Montagne
Date:   Mon Jun 20 15:52:29 2016 +0200
Branches: id-remap
https://developer.blender.org/rBdcd87141c677cd555bf9156bc8559ec6dbfe5c5d

Merge branch 'master' into id-remap

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



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