Merge branch 'hotfix/20140521-pachimon'
mora
Merge branch 'hotfix/20140523-mora' into develop