This is the fork we use in Spinal Stack >= J.I.1.0.0 - View it on GitHub