4.2 dev - working too hard. merge 4.2-dev to master