Merge pull request #1127 from sgrenier/next

Minor fixes and features
Added basic support for multi-line comments in properties files via C-style /* and */.