jinja2 block rendering

[oc]

Distilled example:

!pillar/blah/init.sls

foos:
  - site: 'custom-site'
    custom_template: 'salt://foo/etc/foo/custom.conf.jinja'
    bar: False
  - site: 'default-site'

states/foo/init.sls:

{%- for foo in pillar['foos'] %}
/etc/foo/{{ foo.site }}.conf:
    - source: {{ foo.get('custom_template', 'salt://foo/etc/foo/default.conf.jinja') }}
    - template: jinja
    - context:
        {{ foo }}
    - defaults:
        bar: True
        baz: False
{%- endfor %-}

states/foo/etc/foo/default.conf.jinja

# Bla bla

{%- block override_this %}
# This should be overridden
This gets written
{%- endblock %}

# More bla

states/foo/etc/foo/custom.conf.jinja

{% extends "foo/etc/foo/site.conf.jinja" %}
# Deliberately set to be in the same path, just for clarity

{%- block overridde_this %}
# This should be written for custom-site
This should be {{bar}}...

{%- block %}

client (target) salt-call --versions-report

           Salt: 2014.1.1
         Python: 2.7.3 (default, Jan  2 2013, 13:56:14)
         Jinja2: 2.6
       M2Crypto: 0.21.1
 msgpack-python: 0.1.10
   msgpack-pure: Not Installed
       pycrypto: 2.6
         PyYAML: 3.10
          PyZMQ: 13.1.0
            ZMQ: 3.2.3

master (target) salt-master --versions-report

           Salt: 2014.1.1
         Python: 2.7.3 (default, Mar 13 2014, 11:03:55)
         Jinja2: 2.6
       M2Crypto: 0.21.1
 msgpack-python: 0.1.10
   msgpack-pure: Not Installed
       pycrypto: 2.6
         PyYAML: 3.10
          PyZMQ: 13.1.0
            ZMQ: 3.2.3

[oc]

Works after updating to current head