Merge pull request #4340 from akallabeth/init_once
authorDavid Fort <rdp.effort@gmail.com>
Wed, 7 Feb 2018 09:34:18 +0000 (10:34 +0100)
committerGitHub <noreply@github.com>
Wed, 7 Feb 2018 09:34:18 +0000 (10:34 +0100)
Fix remaining issues with #2006


Trivial merge