Merge pull request #487 from kevinpbuckley/5-8