History merge 2

Just merge the history of this page back and forth between the page itself and History merge 1.