Merge pull request #2265 from velotraveler/master