Update to latest upstream.
Merge pull request #1 from johnm/master

Update to latest upstream.