v1.1 fix for tests
Merge branch 'v1.1' into fork_master