minor editing
Merge branch 'play-api'