add missing require("should")
Merge remote-tracking branch 'origin/master'
fix issue with diagnosticInfos encoding/decoding