Update dependency locations
Merge branch '1.x'