There was a problem with the merge.
Merge branch 'master' of https://github.com/elifesciences/lens
Merge branch 'master' into lens_next