when a conditional is the last stament on the line, either make sure there's an extra new line or add some characters behind it.
"trim_blocks" is removing this new line otherwise (http://jinja.pocoo.org/docs/dev/api/#basics).

We now have a branch-adaptation approach so that tools.git can
be a lot less clever as to what goes on internally.  Most meta-
data already comes from here, which is more in line with ports
and plugins.  :)