Upgrade to play 2.3.6
Merge pull request #1 from benmccann/patch-1

Upgrade to play 2.3.6