another merge from develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 3 Sep 2015 11:04:13 +0000 (12:04 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 3 Sep 2015 11:04:13 +0000 (12:04 +0100)

Trivial merge