SLING-1778 update to latest patch from sseifert