When has focus, placeholders go away
Merge branch '1.x' into gh-pages