Merge branch 'master' of github.com:naihe2010/.home.etc.d