Merge remote-tracking branch 'upstream/develop' into develop
UClient module bs3 update
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #775 from sexnothing/develop

UClient module bs3 update