Working first pass at image versioning.
Merge branch 'master' into feature-image-cutting
Merge branch 'master' into feature-image-cutting