Merge branch 'master' of http://git.syncroton.org/Syncroton