merge master into pagoda-minimal