Nuke trailing zeros
Merge pull request #11082 from ZDroid/nuke_zeros

Nuke trailing zeros