And may as well push out 3.6.2 with that fix
3 files changed