Merge "Use American English spelling for behavior"

diff --cc docs/hooks.txt
Simple merge

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc languages/messages/MessagesQqq.php
Simple merge