Merge pull request #1654 from longjon/softmax-missing-values