[tomahawk/f18] (10 commits) ...Merge branch 'f17' into f16

[Rex Dieter]

Summary of changes:

  3e9751c... 0.4.0-1 (*)
  9165dbc... 0.4.0-1 (*)
  14221ce... Merge remote-tracking branch 'origin/master' into f17 (*)
  2186911... Merge remote-tracking branch 'origin/master' into f16 (*)
  24ea0d8... Merge branch 'master' into f17 (*)
  6ffed2b... Merge branch 'master' into f16 (*)
  e8de5de... Merge branch 'master' into f17 (*)
  1cc43b0... Merge branch 'f17' into f16 (*)
  d50d5d3... Merge branch 'f18' into f17 (*)
  7e56993... Merge branch 'f17' into f16 (*)

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