Merge branch 'master' into stable
workaround for new events list layout problem
admin cache-history layout change