Merge branch 'master' into 'test'

# Conflicts:
#   README.md
Status Job ID Name Coverage
  Test
canceled #117
build
test_all