Restore partial placeholder support in card number.
Merge branch 'master' into gh-pages