Merge "Fix setup.cfg using incorrect entry point"