Fixed a broken test
Merge branch '0.10-maintenance'