6.x-1.0-rc3
831faff1 · merge from master and fix conflicts ·