Merge pull request #35 from jsedding/issues/SLING-11483