Merge remote-tracking branch 'upstream/master'
Xiphos: update to 1.7.2