Multiple commits to add support for alternative layouts

Please review the individual commits separately. They are additive.

I did not increment the version number, but rather expected that would be done either during the merge or immediately following it.