Merge branch 'master' into bugfixes
Add callback to be able to test map fetching
Remove unused timeout variables
Add test for map fetching in sync center
Improved test error handling
This one bugfix belongs in master
Merged in master