Merge remote-tracking branch 'upstream' into help

Conflicts:
	quilt/mail.in
	quilt/new.in
	quilt/push.in
	quilt/setup.in