Merge pull request #912 from TheBlueMatt/master