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

[Lukas Tönne]

Commit: 031312820780a9a92e507ae67878738531b4e8dc
Author: Lukas Tönne
Date:   Mon Jan 4 10:48:52 2016 +0100
Branches: object_nodes
https://developer.blender.org/rB031312820780a9a92e507ae67878738531b4e8dc

Merge branch 'master' into object_nodes

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



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