Update from master branch in upstream repository#11

eo-robot wants to merge 2 commits intomainEuro-Office/server:mainfrom

update-from-masterEuro-Office/server:update-from-masterCopy head branch name to clipboard