Merge branch 'carmody'
Merge branch 'master' of https://github.com/mcarmody/GalleryEighteen