6304: Merge branch 'master' into 6304-dns-update-fix
authorLucas Di Pentima <lucas@curoverse.com>
Mon, 10 Apr 2017 17:58:08 +0000 (14:58 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Mon, 10 Apr 2017 17:58:08 +0000 (14:58 -0300)

Trivial merge