Merge pull request #14946 from MichalStrehovsky/master-merge
authorMichal Strehovský <MichalStrehovsky@users.noreply.github.com>
Thu, 9 Nov 2017 00:09:17 +0000 (01:09 +0100)
committerGitHub <noreply@github.com>
Thu, 9 Nov 2017 00:09:17 +0000 (01:09 +0100)
Merge master to dev/defaultintf


Trivial merge