Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-07-20 f4719e1b4419a5ccbcdafe7c717c7d78c4b366ae

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