Resync with origin/master#13

JimClarke5 merged 5 commits intoJimClarke5:masterJimClarke5/java:masterfrom

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