Merge branch 'hotfix/20140523-lov'
yakkun
Merge branch 'hotfix/20140523-yakkun' into develop