.travis.yml: on_failure -> after_failure
Merge branch 'master' into devel