merge of SIFTs Branch
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 11 Nov 2015 13:08:02 +0000 (13:08 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 11 Nov 2015 13:08:02 +0000 (13:08 +0000)

Trivial merge