Merge branch 'master' into app-secure-url
move secure submissions setting into Advanced (and remove Logging parenthetical)
Merge branch 'app-secure-url' into staging2