Merge pull request #1 from alan-wu/master

Update
Merge remote-tracking branch 'libzinc/master'
Fixed indentation of parse node iteration fix.

See tracker item 3393. https://tracker.physiomeproject.org/show_bug.cgi?id=3393
Merge remote-tracking branch 'fieldml/master'
Fix use of unix directory separators on Windows

https://tracker.physiomeproject.org/show_bug.cgi?id=3815
Merge pull request #5 from rchristie/master

Looks good.