Updated for Next Event
Merge branch 'master' into gh-pages