Trying to resolve problems from bad rebase
Merge remote-tracking branch 'origin/nstarke/wd-mybook-live-login-scanner' into nstarke/wd-mybook-live-login-scanner