Merge tilghman's meetme fix for reentering pin (bug #2143)