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

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