Merge pull request #4464 from kumpera/backport-4454-2017-02
commit679777b17b688ea6877d04305605142c979a6a4f
authorRodrigo Kumpera <kumpera@users.noreply.github.com>
Fri, 3 Mar 2017 02:10:14 +0000 (2 21:10 -0500)
committerGitHub <noreply@github.com>
Fri, 3 Mar 2017 02:10:14 +0000 (2 21:10 -0500)
treebc4a78698172dab7c30cd7697edd254eb2f11c87
parentf0c0314e4d132ffa8114af404a8ea5c21ebe0c87
parent10ee1bafc90ead1121e439d25cc9646b4022c9bf
Merge pull request #4464 from kumpera/backport-4454-2017-02

Backport of #4454 to 2017-02