make Imagine tests less fragile
Merge branch '1.2.x'