merge develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 9 Feb 2016 16:57:16 +0000 (16:57 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 9 Feb 2016 16:57:16 +0000 (16:57 +0000)

Trivial merge