develop merge
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 26 Feb 2016 14:26:46 +0000 (14:26 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 26 Feb 2016 14:26:46 +0000 (14:26 +0000)

Trivial merge