Merge pull request #929 from zefciu/RALPH-1432