Merge branch 'master' of github-vasquezg:dichodaemon/trosc

Conflicts:
	src/trosc/scripts/trosc