Merge pull request #2 from google/master

Merge google/iosched master