Passcode bugfix
Bugfix for passcode
Merge pull request #535 from bhariharan/unstable

Passcode bugfix