bernt-matthias Merge pull request galaxyproject#3 from bernt-matthias/sync