Repository moved to github
Merge branch 'maint-1.0' into maint-1.1
Merge branch 'maint-1.1'