Changes to work with 2.2.5.
Merge pull request #1 from JKDingwall/master

Changes to work with 2.2.5.