Merge branch 'refs/heads/develop'
Merge branch 'master' of github.com:moderntribe/the-events-calendar into develop
Merge branch 'develop' of github.com:moderntribe/the-events-calendar into develop