Merge branch 'hotfix/20140916-oroti'
kroko
Merge branch 'hotfix/20140916-kroko' into develop