Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Wed, 15 Mar 2017 19:28:12 +0000 (20:28 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Wed, 15 Mar 2017 19:28:23 +0000 (20:28 +0100)
Needed for compile fix.


Trivial merge