6.x-1.3
0728cc3c · backport of changes to 7.x branch ·