Merge branch 'master' into chore/prepare-2-2-5-release

This commit is contained in:
Martin Donath 2017-12-18 19:40:08 +01:00 committed by GitHub
commit ef7f99e285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

Diff Content Not Available