basic customization 401 tmpl, refs #891
Merge branch 'master' into integration