Merge remote-tracking branch 'google/r1.6' into merge_branch

diff --cc tensorflow/contrib/learn/BUILD
Simple merge

diff --cc tensorflow/docs_src/install/install_c.md
Simple merge

diff --cc tensorflow/docs_src/install/install_go.md
Simple merge

diff --cc tensorflow/docs_src/install/install_java.md
Simple merge

diff --cc tensorflow/docs_src/install/install_linux.md
index e3e115d,be74a0d..fb1e3ef
--- 1/tensorflow/docs_src/install/install_linux.md
--- 2/tensorflow/docs_src/install/install_linux.md
+++ b/tensorflow/docs_src/install/install_linux.md
@@@ -480,8 -481,9 +481,8 @@@ Take the following steps to install Ten
  
       <pre>
       (tensorflow)$ <b>pip install --ignore-installed --upgrade \
-      https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.6.0rc1-cp34-cp34m-linux_x86_64.whl</b></pre>
+      https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.6.0-cp34-cp34m-linux_x86_64.whl</b></pre>
  
 -
  <a name="ValidateYourInstallation"></a>
  ## Validate your installation
  

diff --cc tensorflow/docs_src/install/install_mac.md
Simple merge

diff --cc tensorflow/docs_src/install/install_sources.md
Simple merge

diff --cc tensorflow/docs_src/install/install_windows.md
Simple merge

diff --cc tensorflow/python/keras/_impl/keras/estimator_test.py
index e076dc2,88dd14b..32d1fd2
--- 1/tensorflow/python/keras/_impl/keras/estimator_test.py
--- 2/tensorflow/python/keras/_impl/keras/estimator_test.py
+++ b/tensorflow/python/keras/_impl/keras/estimator_test.py
@@@ -496,22 -377,6 +496,25 @@@ class TestKerasEstimator(test_util.Tens
              keras_model=keras_model,
              model_dir=tempfile.mkdtemp(dir=self._base_dir))
  
++<<<<<<< HEAD
 +  def test_gpu_config(self):
 +    keras_model, (_, _), (_, _), _, _ = get_resource_for_simple_model()
 +    keras_model.compile(
 +        loss='categorical_crossentropy',
 +        optimizer='rmsprop',
 +        metrics=['mse', keras.metrics.categorical_accuracy])
 +
 +    gpu_options = config_pb2.GPUOptions(per_process_gpu_memory_fraction=0.3)
 +    sess_config = config_pb2.ConfigProto(gpu_options=gpu_options)
 +    self._config._session_config = sess_config
 +    keras.estimator.model_to_estimator(
 +        keras_model=keras_model, config=self._config)
 +    self.assertEqual(keras.backend.get_session()
 +                     ._config.gpu_options.per_process_gpu_memory_fraction,
 +                     gpu_options.per_process_gpu_memory_fraction)
 +
++=======
++>>>>>>> google/r1.6
  
  if __name__ == '__main__':
    test.main()

diff --cc tensorflow/tools/pip_package/setup.py
Simple merge