Merge pull request #704 from jgagnon/master