Merge branch 'master' into super-update

Conflicts:
	stuff.txt
Merge pull request #9 from damijanm/super-update

what a fine update