Merge branch 'mojo' of /scm/spider into mojo
authorDirk Koopman <djk@tobit.co.uk>
Mon, 25 Jul 2016 17:56:26 +0000 (18:56 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Mon, 25 Jul 2016 17:56:26 +0000 (18:56 +0100)

Trivial merge