Merging master into pages