Merge branch 'master-apply-aaron-patch2'