Merge remote-tracking branch 'origin/amp/ui-search-cancel-fix'
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Mon, 1 Dec 2014 09:01:40 +0000 (12:01 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Mon, 1 Dec 2014 09:01:40 +0000 (12:01 +0300)

Trivial merge