Merge branch 'sentry'

# Conflicts:
#	README.md
