[Issue #40] Theme Marigolds revision page preferences
Merge branch 'master' into sbgodin