Fix placeholder positioning for firefox
Merge branch 'master' into gh-pages