Merge remote-tracking branch 'core/master' into oss_merge

cpp-driver/README.md

@@ -166,19 +166,19 @@ int main(int argc, char* argv[]) {
 ```
 
 ## License
-Copyright (c) DataStax, Inc.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+© DataStax, Inc.
+
+Licensed under the Apache License, Version 2.0 (the “License”); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
 
 [Apache Cassandra]: http://cassandra.apache.org
 [DSE C/C++ driver]: http://docs.datastax.com/en/developer/cpp-driver-dse/latest