Merge branch 'stable-3.1'

Marius Burkard

2016-05-26 8c6a4706f8bf375738197ed83d1f91d8a17032ef

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