Merge pull request #1099 from jsportaro/master