Merge pull request #277 from swegener/for-upstream