Fix rebase conflict
Merge pull request #1635 from kshedden/glm_offset5

REF/BUG Allow offset and exposure to be used together with log link, see #1486