Merge pull request #2727 from dejaybe87/master