cruft
updated sources from master