Merge release branch securityproxy master release