New simple error dialog class
Merge branch 'master' into API10
Backport to API10