merge rotated and master branch

Manuel Gunkelrequested to merge
master into rotated-bounds

prpopagate Manuels latest changes to the rotated-bounds branch

Merge request reports