Merge pull request #2691 from lilydjwg/master