Release 1.5.3
Merge branch '1.5' into 1.6
Merge branch '1.6' into 1.7
Merge branch '1.7'