This is an extract of a commit, minimally edited to ensure it compiles. Closes #1078. Related to #197.
