Merge branch 'master' into conflictingFontFix
authorDominik Röttsches <d-r@roettsches.de>
Mon, 20 Jun 2016 07:25:43 +0000 (10:25 +0300)
committerGitHub <noreply@github.com>
Mon, 20 Jun 2016 07:25:43 +0000 (10:25 +0300)

Trivial merge