Merge from bbatsov/Prelude