BluePimp: Merge in Pimped rebase