Fixed broken tests.
Merge branch 'release' into dev