[eris/f15] (5 commits) ...The inline fix patch needed fixing and application.

[Bruno Wolff III]

Summary of changes:

  d6f3cd0... Upstream update to 1.3.18. (*)
  0d1f253... Update minimum versions of some build dependencies. (*)
  cac4c8c... Fix incorrect inlining of getMod. (*)
  90d9a60... Add the actual patch to fix the inline issue. (*)
  8b13322... The inline fix patch needed fixing and application. (*)

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