Changes since tag v80000.1

commit f3baacc2329852fb4ae1ac5868197b060805c2aa
Author: Andrew Scott <ascott18@gmail.com>
Date:   Sat Jul 21 20:35:02 2018 -0700

    Fixed some lingering UNIT_POWER usages

