Merge branch 'JAL-1164_disorderforselection' into Release_2_8_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 11 Oct 2013 16:22:59 +0000 (17:22 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 11 Oct 2013 16:22:59 +0000 (17:22 +0100)

Trivial merge