Merge remote-tracking branch 'mono/master' into ping-task-fix