constraints (really)
Merge branch 'dev' of github.com:firepick-delta/firepick-delta into dev