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)
Status Name Job ID Coverage
  Test
failed test:2.7 #653

failed test:3.6 #654

 
Name Stage Failure
failed
test:2.7 Test There is an unknown failure, please try again
No job log
failed
test:3.6 Test There is an unknown failure, please try again
No job log