regarding master, I mostly care about what shows up on pypi since that will cause confusion for our users… although it would be good if we remained consistent in some way for our own sanity