MAGMA-213
Merge pull request #25 from kazoompa/magma-1.5.x

MAGMA-213