Merge branch 'refs/heads/release-2.0'
Merge branch 'master' of github.com:igorline/bd