Merge branch 'hotfix/20140421-nefficent.jp'
qq
Merge branch 'hotfix/20140422-qq' into develop