Merge pull request #1 from bosschaert/SLING-7496