am 13638354: (-s ours) Merge f7306051c160edc22cf32da09eca310ff0e18177

* commit '136383549fb554d91938ddf352cc713abfac9d73':
  bump version to 4.2.1