Merge commit '19031b24b523c872c1ac367821dc60c950a09755' as 'modules/libjuju'