Pull from mpc-hc:master