Merge pull request #2281 from matthewfranglen/master