Merge remote-tracking branch 'reference/py3k' into p3k