Fix for 4.3 passcode.
Merge branch 'master' into unstable