Anda l33t y rotation (el setting)
Merge branch 'florcha', remote-tracking branch 'origin'