Merge pull request #486 from kevinpbuckley/5-8