tried to fix rotating, no real change
Merge remote-tracking branch 'origin/master'