Merge remote-tracking branch 'source/develop'
Merge remote-tracking branch 'source/develop'
Merge remote-tracking branch 'source/develop'
Merge remote-tracking branch 'source/develop'
Merge remote-tracking branch 'source/develop'
Merge remote-tracking branch 'source/develop'
Merge remote-tracking branch 'source/develop'
Merge remote-tracking branch 'source/master'
Fixed #4794 issue
Fixed #4794 issue, setBasePath should working with /
Fixed phpunit test failed last commit 6d9f7a0
Merge branch 'hotfix-4794'
Revert "Fixed phpunit test failed last commit 6d9f7a0"

This reverts commit d7f6c716d63ebb5ceec28abb25cb2e5e3b2077ef.
Revert "Fixed #4794 issue, setBasePath should working with /"

This reverts commit 2a040b64d466f2a5b0e21ada24a0f2c6bce5fff8.
Merge remote-tracking branch 'source/develop'
Merge remote-tracking branch 'source/develop'
Merge commit '27625f9418e1945379cdab101e638bf9763197a9'
Merge commit 'ba30ce5281a999623dfdabdabe0114d863cfca42'
Merge commit '4121f3fe0977a4aefd0bac6ecc67653b1fa8bf06'
Merge remote-tracking branch 'source/master'