Set correct setting value
Additional 1.5 tweaks
Merge pull request #6 from ares/master

More 1.5 related changes