Merge 10.12.2 to master#40828

phil-davis merged 3 commits intomasterowncloud/core:masterfrom

merge-10.12.2-to-masterowncloud/core:merge-10.12.2-to-masterCopy head branch name to clipboard