Merge branch 'master' into 'master'

Marius Burkard

2016-01-12 ee60c95a22aad82742bd9da439acd6ee8f0796af

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