Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-09 9e63ffc814b8087ea8c1ba7c819bc91ff9ee985a

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