JAL-857 merge from develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 28 Jul 2015 09:27:35 +0000 (10:27 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 28 Jul 2015 09:27:35 +0000 (10:27 +0100)

Trivial merge