Update for playtest-20140719.
Merge pull request #150 from pchote/playtest-rc4

Update for playtest-20140719.