Enable testing on Python 3.4
Merge pull request #873 from frewsxcv/patch-1

Enable testing on Python 3.4
Merge remote-tracking branch 'upstream/develop' into develop