Merge pull request #1163 from xanadu/master