Merge remote-tracking branch 'origin/master' into issue-104-cannot-exec-setuids