5.x-1.2
1ad22487 · Merged latest changes from 6.x branch ·