kroko
Merge branch 'hotfix/20140916-kroko'