gaym
Merge branch 'hotfix/20141111-gaym'