tree d3f205087edf8a50565171eda2f5f71701cae82d
parent 4bb94a80466e5c06603f3d734f37d3e10fb34e6c
parent 4e6a923c61ed4280e9c343036b9f9f33beab1133
author Ian Maxon <imaxon@apache.org> 1445044730 -0700
committer Ian Maxon <ian@maxons.email> 1445044917 -0700

Merge branch 'release-0.8.7'

Change-Id: Iadb5074d0e0d7fb2a2d4103aa405e9fc91f443c5