Merge remote-tracking branch 'refs/remotes/google/master'
authorTGIshib <justzeddicus@gmail.com>
Sun, 31 Jul 2016 14:08:25 +0000 (17:08 +0300)
committerTGIshib <justzeddicus@gmail.com>
Sun, 31 Jul 2016 14:08:25 +0000 (17:08 +0300)

Trivial merge