Return correct context after dictionary DOM parsing.
Merge branch 'master' into ePages6