Merge commit 'b1c093809614ee5fb724a82553f7da691139154d'

Conflicts:
	vid-time.txt