Fix parent maildir issue
Basically undoing my edits and pulling in the source again.

Merge remote-tracking branch 'upstream/master'

Conflicts:
	mu4e-maildirs-extension.el