Cleanup
Merge branch '1.3'