Summary of changes: 3b31b2a... Correctly conditionalize ordereddict requirement. (*) 1062641... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent