Merge remote-tracking branch 'XTUPLE/master'
Merge branch 'master' of github.com:julesstp/public-extensions