#JC-1656 Make sure Remember Me doesn't depend on IP address
Merge remote-tracking branch 'origin/master'