Merge "(bug 15853) Wrong entries in history feed"