Merge branch 'daniel/gci2013-image'