merge from jefffhaynes:master