Merge pull request #4091 from totten/master-gitify-options