Merge pull request #2770 from geekinaboxx/master