Use old-style set constructor, for compatibility with python 2.6
Merge remote-tracking branch 'rboulton/fix_26'