Properly merge nested wildcard properties
Merge pull request #1 from bsander/feature/properly-merge-nested-wildcards

Properly merge nested wildcard properties