Merge branch 'features/JAL-1565_jpred4' into Release_2_8_3_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 9 Mar 2015 12:52:11 +0000 (12:52 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 9 Mar 2015 12:52:11 +0000 (12:52 +0000)

Trivial merge