fix bug: kernel version check was causing SHA1 passwords to be generated at login
Merge branch 'mavericks'