Merge master into features

[nicoddemus]

Thanks for submitting a PR, your contribution is really appreciated!

Here's a quick checklist that should be present in PRs (you can delete this text from the final description, this is
just a guideline):

• Create a new changelog file in the changelog folder, with a name like <ISSUE NUMBER>.<TYPE>.rst. See changelog/README.rst for details.
• Target the master branch for bug fixes, documentation updates and trivial changes.
• Target the features branch for new features and removals/deprecations.
• Include documentation when adding new features.
• Include new tests or update existing tests when applicable.

Unless your change is trivial or a small documentation fix (e.g., a typo or reword of a small section) please:

• Add yourself to AUTHORS in alphabetical order;

[RonnyPfannschmidt]

re-triggered the failed travis to finish the run, will merge afterwards

[coveralls]

Coverage decreased (-0.2%) to 93.902% when pulling c00d934 on nicoddemus:merge-master-into-features into f2a427d on pytest-dev:features.