Bug fix
Merge branch 'dev' of github.com:relip/depot into dev