Merge branch 'eventsview'
Merge branch 'master' of https://github.com/cmlizama/sandboxkeystone