Makes boolean options falsible
Merge branch 'pr/133' into stable-1.9