updated deps
Merge commit '3dc23811696879e18d1c14fe23afeffdb54a31e0' into 4.0