Merge branch 'release/1.5'
Added Steven Bell's bad password image.
Merge branch 'hotfix/DS_BadpasswordImage' into development