Back-merge master into multi-dependencies.