Allows to be used in both 1.9.x and 1.10.x environments.
See about for more changes.