swift

ff931770 - Merge branch 'master_2' into tensorflow