Updating version.
Merge branch 'master' into google-search-appliance-compatibility