Merge branch 'dependency-tool' of https://github.com/williamspatrick/op-build into master-next