Fixed broken test.
Merge branch 'release' into dev