tree 8c4dbcbb8494aa58e04611e79fe9d98d76a369a8
parent e7fa8d08336ccb4f65b59e6cd641f782aaa350c4
author Natalie Weizenbaum <nweiz@google.com> 1437431413 -0700
committer Natalie Weizenbaum <nweiz@google.com> 1461879549 -0700

Backport fixes from master to 0.9.7+x.