Fix safari question transitions
Merge branch 'master' into feature-image-cutting