Merge pull request #2422 from keremet/oi/hipster