Merge commit '3835e52' into release-0.14 (Fix info callback support so it gets the Connection instance again)