Merge pull request #1136 from reverson/master