Version submitted evening of 13 Feb.
Merged.