Sync to current version in O'Reilly's repo.