Fixed bug #463 - Removed unnecessary Overview conditional
Merge branch 'master' into production