Moved a method that was specific to the ContentSpecParser.
Merge branch 'master' into devel
Fixed an issue where reading in a file would cause extra or less new line characters.
Merge branch 'master' into devel