Merge branch 'letsencrypt-alias' into 'stable-3.1'

Marius Burkard

2016-07-04 67f562d6772e032e72a6fe11a2cf2a90fd62b73b

1
ALTER TABLE `directive_snippets` ADD `master_directive_snippets_id` int(11) unsigned NOT NULL DEFAULT '0' AFTER `active`;