Fix location of the which function
Merge commit 'HEAD@{1}' into develop