Merge branch 'master' into development
Merge branch 'development' of https://github.com/tbergehenegouwen/office into development