Merge commit 'refs/gh-pull/remotes/origin/6' into HEAD

Conflicts:
	bugzilla-email-recovery/extract.py
Fix buginfo not populating