Closes #580 by generating image keys based on the time in ms.
Merge branch '2.1final' into qa