Merge pull request #696 from trevorrea/master