Merge pull request #963 from kebby/master