Upped the version of six.
Merge branch 'master' into dsuch-f-gh175-pubsub-rest-interface