Merge branch '6304-dns-update-fix'
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 11 Apr 2017 13:33:24 +0000 (10:33 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 11 Apr 2017 13:33:24 +0000 (10:33 -0300)
Closes #6304


Trivial merge