PRs #426 and #427

[ This has now bounced twice. *Grump* ]

Hello folks,

I propose to merge #426 and #427 without discussion. If you object,
please let me know.

                                        Be seeing you,
                                          norm

--
Norm Tovey-Walsh
Saxonica