Merge branch 'feature/JAL-3121gffAttributeMap' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 Jan 2020 12:30:07 +0000 (12:30 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 28 Jan 2020 12:30:07 +0000 (12:30 +0000)

Trivial merge