1.5 for 1.6

Merge 1.5 into 1.6.

CI is currently running.