quick and dirty update to master
Merge branch 'master' into reformForRegistration