Merging in changes from 7.x-1.x-dev branch into .make file