Corrected test
Merge branch '1.1'