Merge remote-tracking branch 'danvk/292-squash' into utc_datetime_labels-issue_498-v2

This is an squash and rebase onto last version of master.
Some minor changes added as per comments in the PR.