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

[Bastien Montagne]

Commit: b111e0f645205840f3141d3696de74a138ba14bd
Author: Bastien Montagne
Date:   Wed Apr 6 15:16:39 2016 +0200
Branches: id-remap
https://developer.blender.org/rBb111e0f645205840f3141d3696de74a138ba14bd

Merge branch 'master' into id-remap

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



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