Merge remote-tracking branch 'origin/master' into Applications/18.04

I missed 3 commits due to the timing of the creation of
Applications/18.04 branch versus when I committed. :(

Thanks to tosky for pointing that out to me. But that means these 3
commits won't be available until 18.04.1.