Join the threads with a low timeout.

Instead of using private methods on the threading class, let the
thread join, but with a low timeout.
Support py3.4.
Merge branch 'master' into 371-int
Add a plus to our 3.3 support to denote 3.4 and on
Changelog re #371