Merge pull request #980 from jaypoulz/jp923

Jp923