Issue #1980250 - Make sure to use D6-compatible variable_get() to avoid warnings and issues with custom modes.
Merge branch 'refs/heads/7.x-2.x' into 7.x-2.x-o8-2.3