Merge branch 'vs14-debug-enum' into release