Merge remote-tracking branch 'upstream/release-3.1.1' into new_hash_branding
changing to standing hash from six pack abs to hae a more consistent presentation
Merge pull request #913 from millmanorama/new_hash_branding

changing to standing hash from six pack abs to hae a more consistent presentation