Merge commit 'bd4f04c5ef921f4c1e87e11d5e38eb858f184371'

Conflicts:
	src/fs_utils/file_list.coffee