Fixes #154.
Merge branch 'master' into t145_admin_show_ip