This merge has the following updates marked as versions 1.3.7 onward in the changelog.
NOTE: merged in 36b19902