Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 d933cc2708fe10e648a9b454ba4c0b81ebb606c7

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