- Merged 1397 in branch for 1.2

1 file changed