e8e5901
Initial pseudo merge for dist-git setup This git merge exists to make future git merges much easier.