refresh from upstream

pull last modification from Toops