Implemented diagnostics API (still using stubs, though).
Merge remote-tracking branch 'origin/master'