Merge pull request #1348 from jlipps/master

misc fixes
change order of unlock regexes