Merge pull request #102 from google/master

Two Google Compute Engine fixes: one bugfix, one future prep