[cmake/f15/master] (3 commits) ...Merge branch 'master' into f15

[Orion Poplawski]

Summary of changes:

  28b2f0d... Update to 2.8.4 final (*)
  bfbe8d8... Fixup non-gui builds (*)
  495ea7a... Merge branch 'master' into f15

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