Merge branch 'master' into 'master'

Reverting to python 3.5 for the moment

See merge request !16
2 jobs for v1.0 in 0 seconds (queued for 74 minutes and 35 seconds)