Merge pull request #1 from neverware/bishop-15-1

Update to shim 15.1