Add --selfupdate alias for --self-update
Merge branch '4.0' into 4.1