Reflect changes from api-template master.

I init'd off of a non-master branch accidentally.