Use correct dtype.
Merge branch 'master' into add_softmax