Merge pull request #3234 from ethomson/dont_update_index_unnecessarily Dont update index unnecessarily