Use UTC for time
Merge branch 'master' into use_utc_time

Conflicts:
	image.go