Merge pull request #31761 from Ralith/stdman
stdman: d860212 -> 2017.04.02
authored by Orivej Desh and committed by GitHub 8 years ago 76ed35a4 963204e6