Merge branch 'editor-stripe-fix'
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Tue, 28 Jul 2015 09:56:49 +0000 (12:56 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Tue, 28 Jul 2015 09:56:49 +0000 (12:56 +0300)

Trivial merge