Imported code from svn
Merge branch 'master' of github.com:cameronmurphy/camera-download