Fixed issue #1072.
Merge branch 'v3.0'
Extended fix for issue #1072 to Base and WET themes.