Avoid displaying multiple instances of the same feature pointers on a single screen. props nacin. fixes #25022 for trunk.
Built from https://develop.svn.wordpress.org/trunk@25117


git-svn-id: http://core.svn.wordpress.org/trunk@25097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Make in_category() an alias of has_category(). fixes #16718.
Built from https://develop.svn.wordpress.org/trunk@25119


git-svn-id: http://core.svn.wordpress.org/trunk@25099 1a063a9b-81f0-0310-95a4-ce76da25c4cd