Merge remote-tracking branch 'google/bugfix/#82-shared-library-versioning'