Patches applied as d62a613bcff726dfc835313064228e7bc3b7cda6 and
following, with a completed commit message for the second patch.
Thanks.