Merged revisions 4069-4117 from stable branch.

tbrehm

2013-08-21 7b47c0aa0aeee6f059f00008e36cc210ca89ecb9

1
ALTER TABLE  `web_domain` ADD  `ipv6_address` VARCHAR( 255 ) default NULL AFTER  `ip_address`;