Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' into include-syntax
Add include files feature
enable template with range
add fixtures for persistance test
fix @param types in doc block
fix @param types in doc block
Fix a typo in README.md

Optional data section had a typo in 'ternary' operator description.
Merge pull request #101 from kix/patch-1

Fix a typo in README.md
Merge remote-tracking branch 'rdubigny/master'
Add a few more tests
Merge remote-tracking branch 'addfs/include-syntax'
Small refactoring to keep things in the right order, refs #93
Some wording changes, refs #93
Update changelog
Adjust branch alias
Fix handling of non-existing files, fixes #107
Update target release of master, add tim, switch to psr-4
Allow overriding of persist
Merge latest changes with refactor branch and run PHP fixer over library