mogera
Merge branch 'hotfix/20140523-mogera'