Merge pull request #2252 from matthewfranglen/master