Merge branch 'master' into rpc
authorimarom <[email protected]>
Thu, 3 Sep 2015 02:16:12 +0000 (05:16 +0300)
committerimarom <[email protected]>
Thu, 3 Sep 2015 02:16:12 +0000 (05:16 +0300)

Trivial merge