Merge pull request #584 from dmurdoch/master