Include std when testing
Merge remote-tracking branch 'upstream/master'