Roll to next snapshot and update dependencies.
Roll to next snapshot and update dependencies.
Merge from master.