1.3 to master

Just to verify that the merge dealt with the conflicts correctly.