Merge branch 'master' into 'master'

Marius Cramer

2015-05-22 8684fba8e8b3557a0ee2eee26a128e13e731c7e6

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