Merge branch 'mojo' of ssh://server/scm/spider into mojo
authorDirk Koopman <djk@tobit.co.uk>
Mon, 26 Dec 2016 22:31:57 +0000 (22:31 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Mon, 26 Dec 2016 22:31:57 +0000 (22:31 +0000)

Trivial merge