This is the commit from master bda9752b1036c4d4db76a526a79a091419bf757c that needs cherry-picking to 3.6.2,
Created attachment 7042 [details]
git-am fix from master.
Andreas please check and re-assign to Karolin if you're happy for 3.6.2.
Karolin, could you please pick the patch for Samba 3.6? Thanks!
Pushed to v3-6-test.
Closing out bug report.