Merge pull request #355 from apple/tensorflow-merge

Tensorflow merge