merge
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 30 Sep 2015 13:23:35 +0000 (14:23 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 30 Sep 2015 13:23:35 +0000 (14:23 +0100)

Trivial merge