Merge branch 'hotfix-1.0.1'
Disable os2web_adlib_api in .make.
Merge branch 'hotfix-1.0.2' into develop