Merge remote-tracking branch 'hartwork:one-more-umount-fix'