Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-24 f91c070119e135abbab4f3baf62b32059443ba19

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