4.2

keeping 4.2 in sync with master