Release 1.5.3
Merge branch '1.5' into 1.6
Release 1.6.1