Fix boolean() guard hack, missing from merge @ c7aaf7097cd
Merge branch 'slf-fix-354-merge-bug' into develop