Bring the pricing branch up to date with master

Also fix one conflict.