Sync with 1.3.x (better)
1 file changed