Merge pull request #1633 from sergey-safarov/spec_update