Commit f7da0486ed8884481d477ce08fcf928c4da9a0a3

Dominik Röttsches 2016-06-20T10:25:43

Merge branch 'master' into conflictingFontFix