Merge branches 'helvetica', 'mail' and 'mpack'