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

[Bastien Montagne]

Commit: faf3ee0ae356a441d3ea94b92a95e5504b6eec18
Author: Bastien Montagne
Date:   Mon Jun 27 16:08:05 2016 +0200
Branches: id-remap
https://developer.blender.org/rBfaf3ee0ae356a441d3ea94b92a95e5504b6eec18

Merge branch 'master' into id-remap

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



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