RFC 167: Enforce branding

Created by: unknwon

Part of RFC 167.