Merge pull request #1279 from xanadu/master