Merge remote-tracking branch 'mono/master' into ping-task-fix
authoramccague <amccague@gmail.com>
Wed, 11 May 2016 11:04:53 +0000 (12:04 +0100)
committeramccague <amccague@gmail.com>
Wed, 11 May 2016 11:04:53 +0000 (12:04 +0100)

Trivial merge