Updated some contrib modules
Merge commit 'a6f7e15ef7d74d834fd8bc197d127392aebef6a3' into 7.x-stable