Don't need no stinkin' images
Merge branch 'develop'