xmerl: fix typos
Merge branch 'maint'