Merge pull request #851 from paulfertser/master