update from tosdr.org repo
Merge branch 'master' of github.com:tosdr/tosdr-build
Merge branch 'master' of github.com:tosdr/tosdr-build