dependency location change
dependency changes
Merge branch '1.x' into gh-pages
dependency updates