Merge pull request #343 from micmac1/AST-master
authorJiri Slachta <jiri.slachta@gmail.com>
Thu, 28 Jun 2018 08:43:45 +0000 (10:43 +0200)
committerGitHub <noreply@github.com>
Thu, 28 Jun 2018 08:43:45 +0000 (10:43 +0200)
(for master) asterik: fix AST-2018-007 and AST-2018-008


Trivial merge