Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' into include-syntax
Add include files feature
fix @param types in doc block
fix @param types in doc block
Merge remote-tracking branch 'addfs/include-syntax'
Small refactoring to keep things in the right order, refs #93
Some wording changes, refs #93