Merge "Choose the right executable for wrapped applications." automerge: aa87e89 automerge: 4af0265
automerge: ebc57c7

* commit 'ebc57c7471f1ebe56cae091707887be582b0db06':
  Choose the right executable for wrapped applications.