Merge branch 'stable-3.1'

Marius Burkard

2016-07-05 ec0634332c118fbcd9e30e41563ee669ccf0d787

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