Merge pull request #641 from DavidS/use-stdlib-deprecation