Better 'surprise' orientation handling
Merge branch 'master' into gh-pages