Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc

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