Merge branch 'emailed-patches'