Fixing bug in path resolution of the xpkg task - relates to issue #107
Merge branch 'master' into develop