Merge branch 'master' into 'unittest'

# Conflicts:
#   features/steps/steps.py
5 jobs for unittest in 2 minutes and 8 seconds (queued for 1 minute and 26 seconds)