[pull] master from tensorflow:master#1997

pull[bot] merged 3 commits into

GesuBackups:masterGesuBackups/tensorflow:masterfrom

tensorflow:mastertensorflow/tensorflow:masterCopy head branch name to clipboard