Backport typo in display_time_gui() from the 'lib' branch.
Merge branch 'master' into lib

Conflicts:
	decode_time.c