1.1/master

Sentry fixes