Merge branch 'master' into v2017.1

This commit is contained in:
Jan-Philipp Litza 2017-12-15 20:06:54 +01:00
commit 0888765c2f
No known key found for this signature in database
GPG Key ID: 1FB658053CE27196

Diff Content Not Available