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)
commit209d4d6993e3ce3ccc7677530b0b678a22e3607a
tree8e52b596566b47110225d1f2eb9eba1901ad7f6f
parent7f596d39dff110479f01cffcec203c3a98999b64
parent68496c0b38c3df1237596dc8600ad990140da6a7
Merge branch 'master' into blender2.8

Needed for compile fix.