quick fix for broken build
Merge branch 'master' into wip-types
Migrated sync tests to Tasty, all pass