Added disambiguation on using raw in expressions
Update CHANGELOG - New update will be in 2014

Since time travel isn't invented yet, the next update will (hopefully) take place in 2014, not in 2013.
Fixed recursively calling blocks in templates with inheritance
Add "broken" block inheritance test case
minor #1355 Update CHANGELOG - New update will be in 2014 (PieterWaegeman)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Update CHANGELOG - New update will be in 2014

Since time travel isn't invented yet, the next update will (hopefully) take place in 2014, not in 2013.

Commits
-------

3b4cd96 Update CHANGELOG - New update will be in 2014
bug #1361 Fixed recursively calling blocks in templates with inheritance (hason)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed recursively calling blocks in templates with inheritance

Replaces #1321
Fixes KnpLabs/KnpMenu#136 and KnpLabs/KnpMenu#119

Commits
-------

efb7b47 Add "broken" block inheritance test case
ef98ea2 Fixed recursively calling blocks in templates with inheritance
updated CHANGELOG
Fixed inheritance in a 'use'-hierarchy
Fix typo: providing => provided
minor #1372 Fix typo: providing => provided (ifdattic)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Fix typo: providing => provided

Commits
-------

2511617 Fix typo: providing => provided
Fix typo: filters => filter
Added isSandbox check around the __toString check
Added test for sandbox __toString when not enabled
minor #1375 Fix typo: filters => filter (ifdattic)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Fix typo: filters => filter

Commits
-------

a8a1f12 Fix typo: filters => filter
made types consistent with the ones of Hack
made usage of return; instead of return null;
minor #1383 Consistency (fabpot)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Consistency

Commits
-------

365feec made usage of return; instead of return null;
81699ca made types consistent with the ones of Hack
Move method so it's only called when necessary
minor #1389 Move method so it's only called when necessary (Tobion)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Move method so it's only called when necessary

Small performance improvement for getAttribute

Commits
-------

a28e0f1 Move method so it's only called when necessary
Fixed typo (escaping strategy).