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

[Bastien Montagne]

Commit: 16641d4c0280b8fcc8d12e0e80f138c4f15f6b07
Author: Bastien Montagne
Date:   Tue May 24 12:29:07 2016 +0200
Branches: id-remap
https://developer.blender.org/rB16641d4c0280b8fcc8d12e0e80f138c4f15f6b07

Merge branch 'master' into id-remap

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



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