Merge branch 'refs/heads/1.1/master' into 1.1/develop
Merge branch '1.1/develop' of github.com:cartalyst/sentry into 1.1/develop