This would close #1148. I haven't tested it myself yet. @TheAssassin: Could you update the Sentry part?