Merge branch 'master' into update-0.16.11

This commit is contained in:
Florian Kinder 2017-12-31 00:35:51 +01:00 committed by GitHub
commit aa5e51680f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

Diff Content Not Available