Update for inclusion in niaquinto/docker-images