Commit 7aa3631dd06af74a1fa9f0bfaa5f721876be817f

Dominik Röttsches 2016-06-28T09:52:18

Merge branch 'master' into conflictingFontFix