Some contact form issues fixed
Merge branch 'master' into qa