Merge pull request #1341 from xanadu/master