Merge pull request #1 from google/master

Pull from google:master
Merge pull request #2 from amounir86/master

Pull from google:master
Merge pull request #3 from amounir86/tux

Tux