Merge branch 'jc/mailinfo-lib'