Merge pull request #2834 from makruger/oi/hipster