2014.9.28.1

Change-Id: Id2495529a16c612ada90b29261d495066866231f
Merge branch 'master' of https://github.com/WeijieHu/mygit