Fixed all broken tests.
Merge branch 'refs/heads/release'