Merge branch 'rpc'
authorimarom <[email protected]>
Wed, 2 Sep 2015 13:33:04 +0000 (16:33 +0300)
committerimarom <[email protected]>
Wed, 2 Sep 2015 13:33:04 +0000 (16:33 +0300)

Trivial merge