Merge branch 'master' into nightly

This commit is contained in:
Mikael Nordfeldth 2017-04-16 11:04:58 +02:00
commit 2a8ab1c6ca

Diff Content Not Available