Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-08 81a4dc5a1f17848bf544dae54582097b93c295cc

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