Merge from master. Re-license and more agressive caching of generated
images.