Determine executable paths if defaults aren't executable
Merge commit '787744fa5effc086b63e3d1620ba771a5aae91f3'