Merge pull request #3800 from ey6es/master

Eliminate wacky scales in favor of newfangled "meters."