Revert "Merge branch 'branch'"

This reverts commit c5d12c3dfe8508d4cb63c4b96afd1ff168cac40e, reversing
changes made to dcd2a598b36eda38ee9dc7aa304ac2c82cb7860a.
Revert "Revert "Merge branch 'branch'""

This reverts commit ec9ab4eac5fccbf5e75e7eaac2255098b020c5c1.
Merge pull request #1 from jnevelson/test

Test