Updating development with upstream changes #2

Closed
muellerr wants to merge 38 commits from mueller/master into development
73 changed files with 917 additions and 1027 deletions
Showing only changes of commit 04c92bcdfc - Show all commits