merge master->edd1.9.14