Merge branch 'master' into ci-playground

1 job for ci-playground in 2 minutes and 20 seconds (queued for 2 seconds)
Name Stage Failure
tox_tests Test There is an unknown failure, please try again
  hypothesis_temporary_module_75754ffecc2de173baac9b38837812049b3300f4:25: HypothesisDeprecationWarning: Test took 340.22ms to run. In future the default deadline setting will be 200ms, which will make this an error. You can set deadline to an explicit value of e.g. 400 to turn tests slower than this into an error, or you can set it to None to disable this check entirely.

-- Docs:
=============== 3 failed, 8 passed, 6 warnings in 30.00 seconds ================
ERROR: InvocationError: '/builds/grp-svergun/galumph/.tox/py35/bin/pytest -sv'
___________________________________ summary ____________________________________
ERROR: py27: commands failed
ERROR: py35: commands failed
ERROR: Job failed: exit code 1