b83a285...ed04de1 merged from master