com2us
Merge branch 'hotfix/20140828-com2us'