Upgrade a DFA.union implementation
Merge branch 'nando'