fix
Merge branch 'release-v0.6' of https://github.com/liqites/warehouse into release-v1.6