Merge 1.6 into 1.7

Upmerge of changes in 1.6 to 1.7 since the last merge.

CI is running, but given the very limited number of changes (none functionally) and compilation passing on TravisCI, I expect no issues.