Fix for
#240 Block Comment Behavior results in nested block comments
Merge remote-tracking branch 'stevenaz/master'

Conflicts:
	ChangeLog.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog.txt