Combined patches from #2175891 and #2195479 so that drush make would apply them.