merge
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 14 Aug 2015 15:40:53 +0000 (16:40 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 14 Aug 2015 15:40:53 +0000 (16:40 +0100)

Trivial merge