- upgrade to play 2.3.1
- minor changes for processing of Option values
Merge remote-tracking branch 'origin/master'