[vym/f17] 2.1.7.

[Jon Ciesla]

Summary of changes:

  9e23715... 2.1.7. (*)

(*) This commit already existed in another branch; no separate mail sent