make isMaster lockType NONE to prevent deadlock with relinquish, fixes #261
Merge branch 'bugfix/261'
Merge branch 'master' into stringdata