Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 18 Apr 2017 14:47:25 +0000 (16:47 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 18 Apr 2017 14:47:25 +0000 (16:47 +0200)
commitbb31648b9b4d676b66be126f1842fa4a654f5fa1
treef643827f9e08d994d5f20f21e5b09dfd65805f84
parent2c29b94384d2c556563a3126563704a7e1173c65
parent5bdbc88ab81891eff0dafaabf7f58a9c865d6e48
Merge branch 'master' into blender2.8