Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-27 f8a07d139335a2c21a288546e6fb1922e4623127

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