Add mailbox.org to list of providers
Merge remote-tracking branch 'upstream/master'