grouper hybrid
Merge https://github.com/droyd/vendor_odyssey into jb4.3