Fixed parse error.
Merge tag 'wp-1.2.2' into stable