Fixes #324. Bad merging of dialects containing processors matching non-elements.
Merge branch '2.1-dev' into 3.0-dev