Additional minor changes after rebase (corrections to quantity.py/CHANGES.rst)