Merge pull request #2594 from AndWac/oi/hipster