Issue #615 - fix titlebar caption center alignment issue

The branch is up-to-date. You should be able to merge the changes.