Update events branch with new code from master. #314

Closed klondikemarlen closed 6 years ago