Updated dependency versions
Merged in master