[ksirk/f20] (10 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  73c2528... 4.11.90 (*)
  a19e164... 4.11.95 (*)
  6c96228... 4.11.97 (*)
  6639d86... use bundled iris (*)
  e354c98... 4.12.0 (*)
  255f0ad... 4.12.1 (*)
  0a93a79... 4.12.2 (*)
  6fdd130... Revert "4.11.5"
  9a3ed2f... Revert "4.11.4"
  fbecba8... Merge branch 'master' into f20

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