Merge pull request #1249 from mattleibow/master