Merge changes from square/master into google/master
Merge pull request #16 from cgruber/mergefromupstream

Merge changes from square/master into google/master