Merge pull request #405 from sipa/syncdefault