Merge remote branch 'trondeau/qtclock'