Merge branch 'fix-issue-3943' into 'stable-3.1'

Till Brehm

2016-06-14 da8c5263302809434d43c9f385f8bac57b49d851

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