Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Jul 2017 21:45:36 +0000 (23:45 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Jul 2017 21:45:36 +0000 (23:45 +0200)
commitf7e4484bfe8fd40331b0a42e0b4ef80ea5084b2f
tree56f53bb0ec6d6d1261220eb8d018e1dca49adc76
parentfdadb4829cec1964040c944f90c2d7dc08e505c7
parentba256b32ee5d3ab7991fe5abbb47071ccfe8577c
Merge branch 'master' into blender2.8