10218: Merge branch 'master' into 10218-record-node-info
authorLucas Di Pentima <lucas@curoverse.com>
Wed, 22 Mar 2017 18:45:49 +0000 (15:45 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Wed, 22 Mar 2017 18:45:49 +0000 (15:45 -0300)

Trivial merge