Merge pull request #14832 from MichalStrehovsky/master-merge
authorMichal Strehovský <MichalStrehovsky@users.noreply.github.com>
Thu, 2 Nov 2017 22:58:50 +0000 (23:58 +0100)
committerGitHub <noreply@github.com>
Thu, 2 Nov 2017 22:58:50 +0000 (23:58 +0100)
Merge master to dev/defaultintf


Trivial merge