Merge branch 'master_fixes' into 'master'

Dominik

2014-02-26 5a2985f97fb4ef24085722957b3a5e53bfa38949

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