Update for 1.7.2

Ready to be merged.
@Vexatos You may be interested