upgrade 5.4.15 to 5.4.16
Merge branch 'master' of https://github.com/netkiller/shell