Ensure placeholders are called when a value is added
Merge branch '1.x' into gh-pages