Merge remote-tracking branch 'renky/master_fixes'

Marius Cramer

2014-04-10 7e886ae640ca6b38b332f139427d69ae50cca352

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