Fix py3k super() usage in py2k code. Woops.

py2k backwards compatibility.
Merge remote-tracking branch 'origin/master'