Merge remote-tracking branch 'mono/master' into ping-task-fix
authoramccague <amccague@gmail.com>
Tue, 10 May 2016 16:27:56 +0000 (17:27 +0100)
committeramccague <amccague@gmail.com>
Tue, 10 May 2016 16:27:56 +0000 (17:27 +0100)

Trivial merge