Merge branch 'develop' into JAL-1640_stylesettings
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 9 Feb 2015 15:30:40 +0000 (15:30 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 9 Feb 2015 15:30:40 +0000 (15:30 +0000)

Trivial merge