Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm

2016-05-19 9d3f20bb3ef7391c94eae54ddf3750bcc181678e

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