Fix a test
Merge branch 'master' into develop