Add dots to valid path characters
Merge pull request #7355 from itiut/add-dots-to-valid-path-chars

Add dots to valid path characters
Retinafy favicon.ico
Merge pull request #7371 from mwarkentin/devel

Retinafy favicon.ico
Do not base synchronize source on the inventory directory

Fixes #7366
Correctly initialize combined_cache for hosts if setup is skipped

Fixes #7364
Handle ValueError during json.loads of json data from build
Merge pull request #7373 from sivel/issue/7367

Handle ValueError during json.loads of json data from build
Update ssh.py

Convert to string to fix runtime error due to string concat in self.common_args += ["-o", "User="+self.user] when ansible_ssh_user is numeric
Fix missing variable initialization so an unspecified internal_network runs
Merge branch 'marcore-devel' into devel
Merge pull request #7380 from carsongee/cg/quantum_ip_subnet

Fix missing variable initialization so an unspecified internal_network works
Merge pull request #7382 from jimi-c/issue_7366_synchronize_inventory_dir

Do not base synchronize source on the inventory directory
Use utils.combine_vars on vars_files data

Fixes #7345
Correctly cast the size_gb value for vpshere disks

Fixes #7385
Properly merge role conditionals in with pre-existing conditionals

Fixes #7387
Add missing basedir to Runner in _do_setup_step
Clarify that the encrypted param must also be set.

While the encrypted parameter's documentation clearly states that it needs to
be set, if you are focused on the password parameter's documentation, there's
nothing to draw your attention to the fact that encrypted may also need to be
set.
Fix env splitting in docker module

ENV variable value could contain '=' (for example mysql://host/db?pool=10)
Merge pull request #7393 from jimi-c/issue_7387_role_conditionals

Properly merge role conditionals in with pre-existing conditionals