[devedeng/f25] Updated to new upstream release

[Andrea Musuruane]

Summary of changes:

  a48bfb1... Updated to new upstream release (*)

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