[Bf-blender-cvs] [3cb01d1] object_nodes: Merge branch 'master' into object_nodes

[Lukas Tönne]

Commit: 3cb01d1409676a42c40ad78d31a423347613bf4a
Author: Lukas Tönne
Date:   Mon Dec 14 13:58:32 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB3cb01d1409676a42c40ad78d31a423347613bf4a

Merge branch 'master' into object_nodes

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



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