Merge branch 'fontx' into master (final update is interdependent)