yakkun
Merge branch 'hotfix/20140523-yakkun'