Merge from wercker