Fix api/builder if your using a webroot
Merge pull request #983 from Hellowlol/fix_builder_behindwebroot

Fix api/builder if your using a webroot
Fixed issue #984 - EZRSS changes
Merge remote-tracking branch 'origin/develop' into develop