Dictionary Development, 1.0 branch (2017.04.27.)
This is a cherry pick of merge requests !36 (merged) and !37 (merged) for the 1.0 branch. It is meant to fix the build issues encountered in the CI system because of the extended dependency checks used in the dictionary generation.