[pull] master from unlock-protocol:master#125

pull[bot] merged 2 commits intosearchableguy:mastersearchableguy/unlock:masterfrom

unlock-protocol:masterunlock-protocol/unlock:masterCopy head branch name to clipboard