Merge pull request #240 from mballance-sf/master

Updates for the 1.3.6 release
Update for 1.3.7
Correct an issue with brace matching in the presence of escaped double
quotes