error reporting null
Merge branch 'master18'