Wednesday afternoon work.
Merge commit '9ca9dc5'