Merge remote-tracking branch 'refs/remotes/google/master'
authorTGIshib <justzeddicus@gmail.com>
Tue, 2 Aug 2016 09:41:20 +0000 (12:41 +0300)
committerTGIshib <justzeddicus@gmail.com>
Tue, 2 Aug 2016 09:41:20 +0000 (12:41 +0300)

Trivial merge