Merge pull request #1720 from nnnick/fix/1718

Allow the user to change the time label display formats