Work around DMD associative array bug. Fixes #179.
Merge branch '0.9.20'