Merge branch 'stable-3.1'

Marius Burkard

2016-06-07 b63119417fe6e4bbcd072108d7dec927ee879d4a

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