Fix #590
Merge branch '2.4'