Update PlayJsonSupport to latest changes in master.