Merge branch 'jc/mailinfo-scissors'