zeroPad NA handling

David Watkins requested to merge wdwatkins:master into master Jun 14, 2016