Closes #2281
Merge pull request #2282 from jpadilla/master

Closes #2281