Merge pull request #1985 from jeffwilcox/dev

important x:nil fix