Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-05-06 0ebe6194791bdf59f85b1037a6a43327ac199fe4

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