Merge branch 'master' into 'master'

Marius Cramer

2014-10-13 559b657f9fc6a5374de9b7b1caf20abd4e308d76

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