qq
Merge branch 'hotfix/20140422-qq'