N3651 Variable Templates (Revision 1)

The example requested by change set 6 was merged into the existing
example for that paragraph.

The order of "class/function/variable" was kept consistent in applying
change 8 in [temp.inst].

I struck "member function" from the added sentence
"If the explicit instantiation is for a variable or member function,
the unqualified-id in the declaration shall be a template-id." because
that case was already covered in the existing text.

I reordered the appearance of "variable template" to make it
consistent with the rest of the section in a few paragraphs.

I formatted "const" in "const variables" as fixed-width.

I added a missing "a" to "has constexpr specifier" in the existing
text.

I changed "template<typename T>" to "template<class T>" for
consistency with existing examples in the clause.
N3638 Return type deduction for normal functions

The grammar reference was updated.

N3638 was based off an earlier draft than N3485. This caused some
conflicts in the middle of the [dcl.spec.auto] changes. These were
resolved based on feedback from the paper author.
N3649 Generic (Polymorphic) Lambda Expressions (Revision 3)

Because of conflicts with N3638, I had to change the [dcl.spec.auto]
changes quite a bit, and I recommend CWG create an issue to review the
merged state.

In the example provided (f1, f2, g, h, glambda), it is not clear to me
what "ID" refers to in comments like "error: ID is not convertible".
N3652 Relaxing constraints on constexpr functions

Conflicts resolved as indicated by N3652.