Merge pull request #2011 from gmagnotta/master