Fix for http://gsd.uwaterloo.ca:8888/question/1043/unintuitive-typing-for-unions
Merged develop into WarningFixes