Updated dependencies
Merge branch '1-2-stable'