automerge: 4af0265 * commit '4af0265a35bcd8a0a7513dd85fe371597e2038c5': Choose the right executable for wrapped applications.