Merge branch 'master' into nontermination

https://github.com/eed3si9n/scalaxb/issues/230 still not resolved.