Merge branch 'JAL-1164_regression' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Sun, 27 Apr 2014 20:36:44 +0000 (21:36 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Sun, 27 Apr 2014 20:36:44 +0000 (21:36 +0100)

Trivial merge