Merge branch 'JAL-1430_mfa_ext' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 27 Jan 2014 13:53:40 +0000 (13:53 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 27 Jan 2014 13:53:40 +0000 (13:53 +0000)

Trivial merge