upgrade kernel from v3.18.1
Merge branch 'PeterDaveHello-upgrade_kernel'
Merge branch 'master' into v7client