5.x-1.7
b032f0a7 · Sync with HEAD changes and copy over changes. ·