Merge pull request #2055 from rmehta/aug-11

Timeline and Folds