End of branch 'dictionary-rewrite' -- do not merge!
Analysis by @nwolek & @theod shows that this work is already part of the 'dev' branch, likely due to branch that happened between commits 28e7d2b & 83a2824
closes #182