Update from master branch in upstream repository#78

rikled wants to merge 7 commits into

mainEuro-Office/core:mainfrom

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