merge in properties from original master branch