bors Auto merge of #1309 - alexcrichton:bump, r=gnzlbg …