tree d74a03e2a612a76dfb8aefc15f5e6f9992ca8f7e
parent 556fe997132e8798d5cc1b445e2c5b273154b7f7
parent 0bc157e256d55babd6a68891b53324640c53cea2
author William Hesse <whesse@google.com> 1442510785 +0200
committer William Hesse <whesse@google.com> 1442510785 +0200

Version 1.13.0-dev.3.1

Cherry-pick 8e68b67430a3c29c86711e2a4534e5c831ede3e8 to dev
Cherry-pick 1390b664cbc1674fb828dc772431fa7957c4f5e9 to dev
Cherry-pick a580bafc5de1ff9a66d642fa92f5eb85fb2f1a31 to dev