Merge pull request #4112 from manolama/tweaks
authorRobert <me@rwinslow.com>
Fri, 9 Dec 2016 22:29:57 +0000 (14:29 -0800)
committerGitHub <noreply@github.com>
Fri, 9 Dec 2016 22:29:57 +0000 (14:29 -0800)
Restore the ''import "unsafe'' removed in 36daedf35fd0cc2ad0e5e24d187


Trivial merge