Squashed 'sub/' changes from e79dbc8..f3e31c4

f3e31c4 made a change directly on sub
4191f69 changed code in sub

git-subtree-dir: sub
git-subtree-split: f3e31c4dce8d9cc6ee52b6573df7930e79963063
merging pull from sub