Integrate Action Pack with rack 1.5 / master