Merge branch 'features/JAL-1667_1668-documentation' into Release_2_8_3_Branch
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 22 Apr 2015 15:47:55 +0000 (16:47 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 22 Apr 2015 15:47:55 +0000 (16:47 +0100)

Trivial merge