[releng] merging changes from master