Commit c788a55927123533efe29e29a5ea236a2f749c94

eustas 2016-01-19T14:11:13

Merge pull request #1 from google/master Rebase