am 34cf9d6e: (-s ours) Add wildcard support to stubpackages DO NOT MERGE

* commit '34cf9d6e3a6448578438e925384114177de3978a':
  Add wildcard support to stubpackages DO NOT MERGE