Upgraded to PlayN 1.8.5
Merge branch 'story' of https://github.com/thomaswp/tuxblocks into story