backport zero-padding bugfix from github
backport zero-padding bugfix from github

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