swift

d49bcb97 - Merge branch 'master_final' into tensorflow-merge