Fix https://github.com/rust-lang/rust/pull/18827 related issue.
Merge pull request #435 from mtsr/rfc369-numerics-fixes

Fix https://github.com/rust-lang/rust/pull/18827 related issue.