Merge "(bug 24437) Add nofollow to image link"