2013-0ß8-19: erasing irritations ;-)
2013-08-19: minor improvements
2013-08-19: speficications of being a derivative work added
Merge branch 'kreincke' into integration
Merge branch 'integration' into gsharpe

Conflicts:
	000-branch-gsharpe
	000-branch-integration
	000-branch-kreincke