am 661b4f78: Cumulative patch from commit a313d17de943cbaf12cbf67d666af14791be8ad2

* commit '661b4f78e48c697429dc46154a4125892c001718':
  Cumulative patch from commit a313d17de943cbaf12cbf67d666af14791be8ad2