Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Wed, 29 Mar 2017 21:01:16 +0000 (23:01 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Wed, 29 Mar 2017 21:01:16 +0000 (23:01 +0200)

Trivial merge