fix for scoped areas
Merge branch 'master' into version_1_9
better candidates page
Merge branch 'version_1_9' into version_2_0