Code changes similar to those in master
Merge remote-tracking branch 'origin/dir_recursion' into dir_recursion

Conflicts:
	tilde_enum.py