Issue #2085201 by jessebeach, tim.plunkett, dawehner, yoroy: Use sensible block categories (rather than module-name categories).