mora
Merge branch 'hotfix/20140523-mora'