Merge remote-tracking branch 'myrepo/master'

im2txt/README.md

@@ -322,7 +322,7 @@ bazel-bin/im2txt/run_inference \
 
 Example output:
 
-```shell
+```
 Captions for image COCO_val2014_000000224477.jpg:
   0) a man riding a wave on top of a surfboard . (p=0.040413)
   1) a person riding a surf board on a wave (p=0.017452)

tutorials/rnn/ptb/reader.py

@@ -28,9 +28,6 @@ import tensorflow as tf
 
 def _read_words(filename):
   with tf.gfile.GFile(filename, "r") as f:
-    if sys.version_info[0] >= 3:
-      return f.read().replace("\n", "<eos>").split()
-    else:
     return f.read().decode("utf-8").replace("\n", "<eos>").split()