Merge pull request #87 from dsteinich/master

PUBSTWO-1025 & PUBSTWO-1060
Test repair