Merge remote branch 'real/devel' into devel
Missing comma in argument spec.
Wrap crypto.hash imports with try/except
Merge pull request #6380 from sivel/best-practice-adhoc

ad-hoc doc fixes
Merge pull request #6381 from franckcuny/doc-module-lang

Document the module_lang option.
Remove remnant merge conflict lines from ansible.spec
Fix changelog dates in ansible.spec
group_vars plugin: do not parse hidden files in subfolders, e.g. avoid .svn/
Allow hash_behaviour=merge to be respected in core inventory

(For now, this means, enable it also for inventory scripts)
Update apt module so that environment variables are set correctly since not going through shell.  Very sorry folks, it will be addressed.
Add generated test files to .gitignore
Fix other reference to APT_ENV_VARS.
Merge pull request #6233 from garethr/aws-autoscaling-groups

Added modules to manage ec2 autoscaling groups
Merge pull request #6372 from mriedelumab/devel

Returning 'NA' when no virtualization found
Merge pull request #6366 from cloudify/devel

Fix for #6365: cloudformation module fails to update if stack exists
Merge pull request #6324 from scottanderson42/bugfix/route53-characters

BUGFIX: route53 module won't round-trip * and @ in records
Merge pull request #6306 from willthames/ec2_module_clearer_failures

Make it easier to determine whether instance creation or tagging fails
Merge pull request #6230 from joshuaconner/bugfix_nova_computer_partial_server_name_match

nova_compute: fix for partial match b/w params['name'] and an existing name
Merge pull request #6104 from gianlucaborello/digitalocean_fix_deletion

Make sure droplet deletion works even when idempotency is achieved using 'name' and 'unique_name' rather than 'id'
Merge pull request #6020 from bpennypacker/ec2_elb_timeout

cloud/ec2_elb module: Added wait_timeout parameter