Squashed 'lib/' changes from cc9b13e..a9d1b22


git-subtree-dir: lib
git-subtree-split: a9d1b223315c0388c1f47c08e8bf986961ad781a
Merge commit '9b72e60c0f78c58dab78890551e9abc5aeca83b7' into ellmaster