Log Message:
Update to 1.2.4, based on PR 19113 by Christian Groessler.
Some additional cleanup by me.

Changes since 0.9.9* are too many to list here -- lots of new features.