sync with 1.08 on WP.org