Merge branch 'master' of github.com:danchapman/placeholderize
Merge branch 'master' of github.com:danchapman/placeholderize