Fixes #2288
Merge branch 'master' of github.com:databrary/databrary