Merge branch 'master' into v4.6.x; updated to correct version number for v4.6.0 branch