Merge branch 'master' into 'master'

Marius Cramer

2015-08-27 7b26eae1b657e81aefe2a50e1c15518f0f6ee935

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