magma 1.7.x
Merge pull request #176 from kazoompa/master

OPAL-1866