Tiny bugfix with placeholder & paste
Merge branch 'master' into gh-pages