Merge branch 'fix-2016-dkim'