Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-02-26 bdc27bfea618952447ef7facab838df5741f1ec3

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