Merge remote-tracking branch 'hlieberman/upstream' into upstream
Merge remote-tracking branch 'hlieberman/upstream' into upstream
fix incorrect debian/changelog entry
Imported Upstream version 1.6.2+dfsg
Merge branch 'upstream'

Conflicts:
	CHANGELOG.md
	VERSION
	lib/ansible/__init__.py
	packaging/debian/changelog
	packaging/rpm/ansible.spec
d/changelog: Update as ready to release.