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

[Bastien Montagne]

Commit: 9400ea06474b88b963488501b244f5b6454fa6db
Author: Bastien Montagne
Date:   Tue May 31 09:38:38 2016 +0200
Branches: id-remap
https://developer.blender.org/rB9400ea06474b88b963488501b244f5b6454fa6db

Merge branch 'master' into id-remap

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



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