am aa3e17e1: Merge "Return path including executable instead of without"

* commit 'aa3e17e1b685218cddeb7a05e68ff1721a322147':
  Return path including executable instead of without