PR
#4047 has been merged into devel. It has also been merged (with difficulty!) into PR
#4033, which adds new layouts.
I have taken this step now because it seems likely I shall undergo yet another surgery on my right eye. I wanted to do the complicated merges now, while most of the details are fresh in my mind.
I would also like to merge #4033 today, so we can all test the new code while I recuperate.
Edward