Merge "Rename Events to Present tense" into devel/master