- merged different fixes and updates from foreign branches

Marius Burkard

2016-01-04 d22277878254cf33fd63ca1bf12b215f4e030a27

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