Merge pull request #1183 from lynnaloo/master