Merge pull request #374 from patriot1burke/master

iframe check login
per-realm admin
Merge remote-tracking branch 'upstream/master'