Squashed 'lib/' changes from 0ada2c0..f7095af

f7095af after8 in sub
f775d57 after7 in super

git-subtree-dir: lib
git-subtree-split: f7095af81885990faf3b6f6beb55ffb4c76cbd6b
Merge commit 'ca679eef14e5b028e6ef0c9a98a34d6d1358435b'

Conflicts:
	lib/bbbb.txt