sync commits that missed last 2013.02 PR but are already in develop

fixed syntax error for affinity groups