changed placeholder
Merge branch 'master' into images