Backwards compatibility with 2.3.x
Merge branch 'master' of github.com:cortex/payday