Auto merge of #154 - kcking:master, r=mrmonday
Auto merge of #154 - kcking:master, r=mrmonday

use DiagnosticBuilder for multiple payload error

fixes nightly compilation on 12-31-2015

libpnet/libpnet,symphorien/libpnet,symphorien/libpnet,symphorien/libpnet,mrmonday/libpnet,libpnet/libpnet,mrmonday/libpnet,fsck/libpnet,libpnet/libpnet,libpnet/libpnet,mrmonday/libpnet,fsck/libpnet,fsck/libpnet,fsck/libpnet,symphorien/libpnet,mrmonday/libpnet