Better dynamic font handling...
Merge branch 'development' into fd5