Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-20 ba59737e157c0e1ce23b2443f08733b9f9a38bfe

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