Pushed to upstream

cc/ @migue.  Fixing build