fixed error with determining whether grouping by traits should be enabled for VS 2013
Merge remote-tracking branch 'origin' into dev