Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-13 3cf77b791fb646e5837dac63a2e8c06604771b1d

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