Use git submodule update --init
extra/alias: Check +S on target user
Merge branch 'master' into sam-upgrade