Merge latest SlickGrid changes.