Merge pull request #4742 from kumpera/2017-02-backport-4682
commit5673411799f500fda13f2b5af9ca80dd0ceb2037
authorRodrigo Kumpera <kumpera@users.noreply.github.com>
Wed, 26 Apr 2017 04:00:11 +0000 (26 00:00 -0400)
committerGitHub <noreply@github.com>
Wed, 26 Apr 2017 04:00:11 +0000 (26 00:00 -0400)
treefb7617579c902eff39dda8b21d442fe78e65714f
parent1434f9c879380a0c500f7df889b8dca99bf5588c
parent3598a4ab552f5247c3ec6ff24422618cac6194fa
Merge pull request #4742 from kumpera/2017-02-backport-4682

2017 02 backport 4682