build adjust
Merge branch 'master' into fix_hiredis