Auto merge of #1082 - alexcrichton:std-error, r=alexcrichton