Merge branch 'mojo' of ssh://server/scm/spider into mojo
authorDirk Koopman <djk@tobit.co.uk>
Thu, 26 Oct 2017 01:21:58 +0000 (02:21 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Thu, 26 Oct 2017 01:21:58 +0000 (02:21 +0100)

Trivial merge