Merge pull request #374 from kugel-/for-upstream