Merge pull request #14844 from MichalStrehovsky/master-merge
authorMichal Strehovský <MichalStrehovsky@users.noreply.github.com>
Fri, 3 Nov 2017 13:52:39 +0000 (14:52 +0100)
committerGitHub <noreply@github.com>
Fri, 3 Nov 2017 13:52:39 +0000 (14:52 +0100)
Merge master to dev/defaultintf


Trivial merge