Merge pull request #1085 from tetsuok/remove-unnecessary-std