Merge pull request #657 from kbaggott/master