Merge pull request #2697 from square/jwilson.0806.kts

Convert builds to KTS