Merge branch 'master' into dev

This commit is contained in:
André Peters 2017-05-17 21:20:12 +02:00 committed by GitHub
commit a72631fb15