resubmit due to 7530d94f existing in 'stable', prior work was based on 'master'; 'stable' merged to 'master'