dont override accessors
bump version
merge upstream