Re-written to work with parent scope.
Merge remote-tracking branch 'origin/master'

Conflicts:
	placeholder.js