merge
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 25 Sep 2015 10:11:52 +0000 (11:11 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 25 Sep 2015 10:11:52 +0000 (11:11 +0100)

Trivial merge