Fix #361 and #362
Merge branch 'develop' of https://github.com/hypothesis/h into develop