Merge change 1936 into donut

* changes:
  Recovered the code of the gesture library