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

[Lukas Tönne]

Commit: a7da96ad1b6bf5f693fc7bc3a2af2f1a1d1917f0
Author: Lukas Tönne
Date:   Sun Jan 3 10:57:26 2016 +0100
Branches: object_nodes
https://developer.blender.org/rBa7da96ad1b6bf5f693fc7bc3a2af2f1a1d1917f0

Merge branch 'master' into object_nodes

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



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