Only pad zeros when they are needed
Merge branch 'master' into google_code