This commit merges the jessie branch to master. It's a recursive merge with direction to take conflicting hunks from the jessie branch (-Xours).