Merging master into timeline, fixed conflicts