Add progress reporting to reindexing
Merge branch 'develop'