[sticky-notes/f17] Initial import #810928

[athmane]

Summary of changes:

  87d2882... Initial import #810928 (*)

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