Merge pull request #1553 from aerusso/master