Fixed minor hitch in display.
Merge origin/master