Synced with current dev version of blog plugin