* sync with newest puppet