Merge pull request #983 from xen2/master