Synced with SVN on WP.org (version 0.4)