Changed ErrorReport.xdp on request from VB
Merge branch 'master' into test