Switched login-enable to login_enabled.
Merge remote-tracking branch 'origin/dev' into james_branch