10218: Merge branch 'master' into 10218-record-node-info
authorLucas Di Pentima <lucas@curoverse.com>
Mon, 20 Mar 2017 19:07:40 +0000 (16:07 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Mon, 20 Mar 2017 19:07:40 +0000 (16:07 -0300)

Trivial merge