merge fixes from github, add to history
merge fixes from github, add to history

flycutter/grit,github/grit,thommay/grit,redronin/grit,kevinsawicki/grit,mojombo/grit,gitcafe-dev/grit,rgroux/grit,HrishikeshSingh/testmodulerepo,rgroux/grit,gitlabhq/grit,thommay/grit,HrishikeshSingh/testmodulerepo,isabanin/grit,patientslikeme/grit,brynary/grit,renatoramiro/grit,brynary/grit,gitlabhq/grit,flycutter/grit,abicky/grit,kevinsawicki/grit,gitcafe-dev/grit,isabanin/grit