Merge pull request #965 from khorben/master