Merge branch 'master' into conflictingFontFix
authorDominik Röttsches <d-r@roettsches.de>
Wed, 29 Jun 2016 10:10:41 +0000 (12:10 +0200)
committerGitHub <noreply@github.com>
Wed, 29 Jun 2016 10:10:41 +0000 (12:10 +0200)

Trivial merge