fix to 1f84971f17588d9523e418ef8572b4c109181780
fix to 149a4aae5506f6c5fb960c906569ad27ac78e573
Merge branch 'master' of github.com:databrary/databrary