[matahari/f16] (6 commits) ...Merge branch 'master' into f16

[Adam Stokes]

Summary of changes:

  44f34c7... New upstream release (*)
  121662d... Use upstream_version (*)
  5c94a48... upstream upstream_version number (*)
  27f077f... reset upstream_version (*)
  8751037... resolves rhbz 733793 (*)
  2a9ebaf... Merge branch 'master' into f16

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