Doc fix in htpasswd module due to colon on the line
Merge branch 'jail' of https://github.com/mscherer/ansible into mscherer-jail
Minor pep8 cleanup in the new jail connection plugin
Merge branch 'obsd-fix-release' of https://github.com/johanwiren/ansible into johanwiren-obsd-fix-release
Merge branch 'fix_setup' of https://github.com/tonk/ansible into tonk-fix_setup
Merge branch 'ec2_inventory_route53' of https://github.com/herbyg-axial/ansible into herbyg-axial-ec2_inventory_route53
Merge branch 'do_until_14' of https://github.com/bennojoy/ansible into bennojoy-do_until_14
Minor pep8 cleanup and CHANGELOG update for do-until
Merge branch 'empty_inventory' of https://github.com/spil-jasper/ansible into spil-jasper-empty_inventory
Make the ec2 wait code a little smarter

The code to determine the number of running instances could blow up
if the response from AWS did not actually contain any data. This code
makes it a bit smarter in handling, so that it will wait for a valid
response regardless of the wait condition.

Fixes #3980
Merge branch 'digital_ocean_idempotence_take2' of https://github.com/ralphbean/ansible into ralphbean-digital_ocean_idempotence_take2
Added a version_added string to the new digital_ocean module param
Merge pull request #4165 from jerm/devel

dest in s3 module does not work with ~username expansion for home directories
Merge pull request #4222 from lessmian/devel

Module lvol fails when decimal point is a colon
Merge pull request #4228 from mragh/devel

Include database param if provided and valid in django_admin commands
Allow storing input from user in a pause prompt
Merge pull request #4250 from bbhoss/devel

Allow storing input from user in a pause prompt
commit 9db4f7a made a change that also needed to include this to retain correct legacy_playbook_variables behavior
be clear, host module is not related to ansible inventory
Merge pull request #4257 from resmo/doc/changelog

changelog: be clear, host module is not related to ansible inventory