Fix dired initialization bug
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into unstable

Conflicts:
	parts/008-dired.el