Bring branch up to date
Merge branch 'mabrowning-port_to_1_7_10' into port_to_1_7_10