Merge branch 'patch-2' into 'stable-3.1'

Till Brehm

2016-06-28 d44c3fa38bb0e29718ad7d4009342faf9d2a32a7

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