Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-21 856a3fda5a9c7a59bc89e3ac4800465e7b72c591

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